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

Francois Gouget : testbot/PatchUtils: Detect when make_errors needs to be run.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: tools Branch: master Commit: 74397efc8963baed242aad9c9cc59fb5539d8945 URL: https://source.winehq.org/git/tools.git/?a=commit;h=74397efc8963baed242aad9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:53:56 2020 +0100 testbot/PatchUtils: Detect when make_errors needs to be run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 13f9699..cc61e31 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -137,6 +137,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeErrors}) + { + InfoMsg "\nRunning make_errors\n"; + system("cd '$DataDir/$Dir/' && set -x && ./dlls/ntdll/make_errors"); + if ($? != 0) + { + LogMsg "make_errors failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 49bf101..f55dc4b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) + { + $Impacts->{MakeErrors} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1;

1 0

Francois Gouget : testbot/PatchUtils: Escape dots in regular expressions.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: tools Branch: master Commit: 5f3c3e46f4ea27b05eb3189d564b6883171c96da URL: https://source.winehq.org/git/tools.git/?a=commit;h=5f3c3e46f4ea27b05eb3189… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:52:33 2020 +0100 testbot/PatchUtils: Escape dots in regular expressions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 07e6122..49bf101 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -259,7 +259,7 @@ sub _HandleFile($$$) if ($FilePath !~ /^(?:$IgnoredPathsRe)/) { $Impacts->{PatchedRoot} = 1; - if ($FilePath =~ m~/Makefile.in$~ and $Change ne "modify") + if ($FilePath =~ m~/Makefile\.in$~ and $Change ne "modify") { # This adds / removes a directory $Impacts->{MakeMakefiles} = 1; @@ -267,7 +267,7 @@ sub _HandleFile($$$) } # Else patches to this file don't impact the Wine build. } - elsif ($FilePath =~ m~/Makefile.in$~ and $Change eq "new") + elsif ($FilePath =~ m~/Makefile\.in$~ and $Change eq "new") { # This may or may not be a Wine patch but the new Makefile.in will be # added to the build by make_makefiles.

1 0

Francois Gouget : testbot/LogUtils: Highlight the 'last test seen before the exception' lines.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: tools Branch: master Commit: c65e54076f3edaca59deeaba2eefa204b5a194de URL: https://source.winehq.org/git/tools.git/?a=commit;h=c65e54076f3edaca59deeab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:53:15 2020 +0100 testbot/LogUtils: Highlight the 'last test seen before the exception' lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4cc8aaa..bf933a0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -332,7 +332,8 @@ sub GetReportLineCategory($) { return "error"; } - if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or + $Line =~ /: this is the last test seen before the exception/) { return "info"; }

1 0

Jacek Caban : dbghelp: Try loading builtin modules from unix installation.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: e21b61392cbc3a4879f837316c869c44b8dcf685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e21b61392cbc3a4879f83731… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 10 14:54:31 2020 +0100 dbghelp: Try loading builtin modules from unix installation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 1 + dlls/dbghelp/pe_module.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index b52392aece..eea966d6b3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -358,6 +358,7 @@ struct module enum module_type type : 16; unsigned short is_virtual : 1; DWORD64 reloc_delta; + WCHAR* real_path; /* specific information for debug types */ struct module_format* format_info[DFI_LAST]; diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index a29794ef58..b6c7a0728f 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -110,6 +110,7 @@ struct image_file_map { HANDLE hMap; IMAGE_NT_HEADERS ntheader; + BOOL builtin; unsigned full_count; void* full_map; struct diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index fe8ed35108..ef68a15700 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -705,6 +705,7 @@ BOOL module_remove(struct process* pcs, struct module* module) hash_table_destroy(&module->ht_types); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); + HeapFree(GetProcessHeap(), 0, module->real_path); pool_destroy(&module->pool); /* native dbghelp doesn't invoke registered callback(,CBA_SYMBOLS_UNLOADED,) here * so do we diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 0f00b684ba..d0dca134d7 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -33,6 +33,7 @@ #include "image_private.h" #include "winternl.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -41,6 +42,8 @@ struct pe_module_info struct image_file_map fmap; }; +static const char builtin_signature[] = "Wine builtin DLL"; + static void* pe_map_full(struct image_file_map* fmap, IMAGE_NT_HEADERS** nth) { if (!fmap->u.pe.full_map) @@ -230,6 +233,8 @@ static BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_ty case 0x20b: fmap->addr_size = 64; break; default: return FALSE; } + + fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature)); section = (IMAGE_SECTION_HEADER*) ((char*)&nthdr->OptionalHeader + nthdr->FileHeader.SizeOfOptionalHeader); fmap->u.pe.sect = HeapAlloc(GetProcessHeap(), 0, @@ -722,6 +727,70 @@ BOOL pe_load_debug_info(const struct process* pcs, struct module* module) return ret; } +static WCHAR *find_builtin_pe(const WCHAR *path, HANDLE *file) +{ + const WCHAR *base_name; + size_t len, i; + WCHAR *buf; + + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + static const WCHAR winedlldirW[] = {'W','I','N','E','D','L','L','D','I','R','%','u',0}; + + if ((base_name = strrchrW(path, '\\'))) base_name++; + else base_name = path; + + if ((len = GetEnvironmentVariableW(winebuilddirW, NULL, 0))) + { + WCHAR *p, *end; + const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; + const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; + const WCHAR dot_dllW[] = {'.','d','l','l',0}; + const WCHAR dot_exeW[] = {'.','e','x','e',0}; + + if (!(buf = heap_alloc((len + 8 + 2 * lstrlenW(base_name)) * sizeof(WCHAR)))) return NULL; + end = buf + GetEnvironmentVariableW(winebuilddirW, buf, len); + + memcpy(end, dllsW, sizeof(dllsW)); + strcpyW(end + ARRAY_SIZE(dllsW), base_name); + if ((p = strchrW(end, '.')) && !lstrcmpW(p, dot_dllW)) *p = 0; + p = end + strlenW(end); + *p++ = '\\'; + strcpyW(p, base_name); + *file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (*file != INVALID_HANDLE_VALUE) return buf; + + memcpy(end, programsW, sizeof(programsW)); + end += ARRAY_SIZE(programsW); + strcpyW(end, base_name); + if ((p = strchrW(end, '.')) && !lstrcmpW(p, dot_exeW)) *p = 0; + p = end + strlenW(end); + *p++ = '\\'; + strcpyW(p, base_name); + *file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (*file != INVALID_HANDLE_VALUE) return buf; + + heap_free(buf); + } + + for (i = 0;; i++) + { + WCHAR name[64]; + sprintfW(name, winedlldirW, i); + if (!(len = GetEnvironmentVariableW(name, NULL, 0))) break; + if (!(buf = heap_alloc((len + lstrlenW(base_name) + 2) * sizeof(WCHAR)))) return NULL; + + GetEnvironmentVariableW(name, buf, len); + buf[len++] = '\\'; + strcpyW(buf + len, base_name); + *file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (*file != INVALID_HANDLE_VALUE) return buf; + + heap_free(buf); + } + + return NULL; +} + /****************************************************************** * pe_load_native_module * @@ -751,6 +820,19 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { + WCHAR *builtin_path = NULL; + HANDLE builtin_module; + if (modfmt->u.pe_info->fmap.u.pe.builtin && (builtin_path = find_builtin_pe(loaded_name, &builtin_module))) + { + struct image_file_map builtin_fmap; + if (pe_map_file(builtin_module, &builtin_fmap, DMT_PE)) + { + TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin_path)); + pe_unmap_file(&modfmt->u.pe_info->fmap); + modfmt->u.pe_info->fmap = builtin_fmap; + } + CloseHandle(builtin_module); + } if (!base) base = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.ImageBase; if (!size) size = modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.SizeOfImage; @@ -759,6 +841,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, modfmt->u.pe_info->fmap.u.pe.ntheader.OptionalHeader.CheckSum); if (module) { + module->real_path = builtin_path; modfmt->module = module; modfmt->remove = pe_module_remove; modfmt->loc_compute = NULL; @@ -773,6 +856,7 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, else { ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); + heap_free(module->real_path); pe_unmap_file(&modfmt->u.pe_info->fmap); } }

1 0

Brendan Shanks : whoami: Add semi-stub application to display username.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: b36a10596a868e690e32c70f4487c3dc6b9bda7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b36a10596a868e690e32c70f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 9 11:09:52 2020 -0700 whoami: Add semi-stub application to display username. Fixes GTA V hang experienced by some users. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + programs/whoami/Makefile.in | 7 ++++ programs/whoami/main.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+) diff --git a/configure b/configure index d536aa28b9..2910662c14 100755 --- a/configure +++ b/configure @@ -1792,6 +1792,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_whoami enable_wineboot enable_winebrowser enable_winecfg @@ -21266,6 +21267,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser wine_fn_config_makefile programs/winecfg enable_winecfg diff --git a/configure.ac b/configure.ac index f74d539f4e..7c3c6d2b67 100644 --- a/configure.ac +++ b/configure.ac @@ -3973,6 +3973,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) WINE_CONFIG_MAKEFILE(programs/winecfg) diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in new file mode 100644 index 0000000000..a003b0afaa --- /dev/null +++ b/programs/whoami/Makefile.in @@ -0,0 +1,7 @@ +MODULE = whoami.exe +IMPORTS = secur32 + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/whoami/main.c b/programs/whoami/main.c new file mode 100644 index 0000000000..297f12c9a9 --- /dev/null +++ b/programs/whoami/main.c @@ -0,0 +1,95 @@ +/* + * Copyright 2020 Brendan Shanks for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define SECURITY_WIN32 +#include <windows.h> +#include <security.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(whoami); + +static int output_write(const WCHAR* str, int len) +{ + DWORD ret, count; + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); + if (!ret) + { + DWORD lenA; + char* strA; + + /* On Windows WriteConsoleW() fails if the output is redirected. So fall + * back to WriteFile(), assuming the console encoding is still the right + * one in that case. + */ + lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, + NULL, 0, NULL, NULL); + strA = HeapAlloc(GetProcessHeap(), 0, lenA); + if (!strA) + return 0; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, + NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); + HeapFree(GetProcessHeap(), 0, strA); + } + return count; +} + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WCHAR *buf = NULL; + ULONG size = 0; + BOOL result; + + if (argc > 1) + { + int i; + + WINE_FIXME("unsupported arguments:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + } + + result = GetUserNameExW(NameSamCompatible, NULL, &size); + if (result || GetLastError() != ERROR_MORE_DATA) + { + WINE_ERR("GetUserNameExW failed, result %d, error %d\n", result, GetLastError()); + return 1; + } + + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!buf) + { + WINE_ERR("Memory allocation failed\n"); + return 1; + } + + result = GetUserNameExW(NameSamCompatible, buf, &size); + if (result) + { + output_write(buf, size); + output_write(L"\r\n", 2); + } + else + WINE_ERR("GetUserNameExW failed, error %d\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, buf); + return 0; +}

1 0

Jacek Caban : dbghelp: Search also real path location in path_find_symbol_file.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: d731208602393877709d3bb0bdeb28c80f9719b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d731208602393877709d3bb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 10 14:54:42 2020 +0100 dbghelp: Search also real path location in path_find_symbol_file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index f8a7f3d890..014c79c479 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -664,6 +664,11 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul /* 2. check module-path */ file_pathW(module->module.LoadedImageName, buffer); if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + if (module->real_path) + { + file_pathW(module->real_path, buffer); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + } while (searchPath) {

1 0

Alistair Leslie-Hughes : xaudio2_7: Correct reference count on newly created IXAPO object.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 0c65a00c338cfa428d5b40f4f725dc91cd88eb6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c65a00c338cfa428d5b40f4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 9 10:10:30 2020 +0000 xaudio2_7: Correct reference count on newly created IXAPO object. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xapo.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 9788cb38e8..e64523ea19 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -367,12 +367,9 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut } hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + IXAPO_Release(&object->IXAPO_iface); - return S_OK; + return hr; } static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock)

1 0

Andrew Eikum : xaudio2/tests: Add some refcount tests.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: 68da7ea97d29a2f19683d910a5009825da7090eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=68da7ea97d29a2f19683d910… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 10 10:30:49 2020 -0500 xaudio2/tests: Add some refcount tests. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index f2bffdf29f..502b513fb6 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -948,6 +948,7 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) HRESULT hr; IUnknown *fx_unk; unsigned int i; + ULONG rc; HRESULT (CDECL *pCreateFX)(REFCLSID,IUnknown**) = NULL; @@ -1009,7 +1010,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %u\n", rc); } hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, @@ -1027,7 +1029,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "AudioVolumeMeter via CreateFX should have been released, got refcount: %u\n", rc); } hr = pCreateFX(ar_clsids[version - 20], &fx_unk); @@ -1038,7 +1041,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "AudioReverb via CreateFX should have been released, got refcount: %u\n", rc); } FreeLibrary(xapofxdll); @@ -1050,6 +1054,7 @@ static void test_xapo_creation_modern(const char *module) HRESULT hr; IUnknown *fx_unk; unsigned int i; + ULONG rc; HRESULT (CDECL *pCreateFX)(REFCLSID,IUnknown**,void*,UINT32) = NULL; HRESULT (WINAPI *pCAVM)(IUnknown**) = NULL; @@ -1090,7 +1095,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %u\n", rc); } hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, @@ -1109,7 +1115,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %u\n", rc); } pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); @@ -1123,7 +1130,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateAudioVolumeMeter should have been released, got refcount: %u\n", rc); } pCAR = (void*)GetProcAddress(xaudio2dll, "CreateAudioReverb"); @@ -1137,7 +1145,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateAudioReverb should have been released, got refcount: %u\n", rc); } FreeLibrary(xaudio2dll); @@ -1245,6 +1254,7 @@ START_TEST(xaudio2) IXAudio2 *xa = NULL; HANDLE xa28dll; UINT32 has_devices; + ULONG rc; CoInitialize(NULL); @@ -1279,7 +1289,8 @@ START_TEST(xaudio2) }else skip("No audio devices available\n"); - IXAudio27_Release(xa27); + rc = IXAudio27_Release(xa27); + ok(rc == 0, "IXAudio2.7 object should have been released, got refcount %u\n", rc); }else win_skip("XAudio 2.7 not available\n"); @@ -1304,7 +1315,8 @@ START_TEST(xaudio2) }else skip("No audio devices available\n"); - IXAudio2_Release(xa); + rc = IXAudio2_Release(xa); + ok(rc == 0, "IXAudio2 object should have been released, got refcount %u\n", rc); }else win_skip("XAudio 2.8 not available\n");

1 0

Nikolay Sivov : mfplat: Implement CopyToBuffer().
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: b50c7c799908b059085b5fec4e6bc90747de3e5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b50c7c799908b059085b5fec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 10 15:22:57 2020 +0300 mfplat: Implement CopyToBuffer(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 81 +++++++++++++++++++++++++++++++++++------ dlls/mfplat/tests/mfplat.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 160 insertions(+), 11 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 8e54a538f6..07c2517788 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -771,22 +771,29 @@ static HRESULT WINAPI sample_RemoveAllBuffers(IMFSample *iface) return S_OK; } -static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) +static DWORD sample_get_total_length(struct sample *sample) { - struct sample *sample = impl_from_IMFSample(iface); - DWORD length; + DWORD total_length = 0, length; size_t i; - TRACE("%p, %p.\n", iface, total_length); - - *total_length = 0; - - EnterCriticalSection(&sample->attributes.cs); for (i = 0; i < sample->buffer_count; ++i) { + length = 0; if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[i], &length))) - *total_length += length; + total_length += length; } + + return total_length; +} + +static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_length) +{ + struct sample *sample = impl_from_IMFSample(iface); + + TRACE("%p, %p.\n", iface, total_length); + + EnterCriticalSection(&sample->attributes.cs); + *total_length = sample_get_total_length(sample); LeaveCriticalSection(&sample->attributes.cs); return S_OK; @@ -794,9 +801,61 @@ static HRESULT WINAPI sample_GetTotalLength(IMFSample *iface, DWORD *total_lengt static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buffer) { - FIXME("%p, %p.\n", iface, buffer); + struct sample *sample = impl_from_IMFSample(iface); + DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; + BYTE *src_ptr, *dst_ptr; + BOOL locked; + HRESULT hr; + size_t i; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, buffer); + + EnterCriticalSection(&sample->attributes.cs); + + total_length = sample_get_total_length(sample); + dst_current_length = 0; + + dst_ptr = NULL; + dst_length = current_length = 0; + locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length)); + if (locked) + { + if (dst_length < total_length) + hr = MF_E_BUFFERTOOSMALL; + else if (dst_ptr) + { + for (i = 0; i < sample->buffer_count && SUCCEEDED(hr); ++i) + { + src_ptr = NULL; + src_max_length = current_length = 0; + if (SUCCEEDED(hr = IMFMediaBuffer_Lock(sample->buffers[i], &src_ptr, &src_max_length, &current_length))) + { + if (src_ptr) + { + if (current_length > dst_length) + hr = MF_E_BUFFERTOOSMALL; + else if (current_length) + { + memcpy(dst_ptr, src_ptr, current_length); + dst_length -= current_length; + dst_current_length += current_length; + dst_ptr += current_length; + } + } + IMFMediaBuffer_Unlock(sample->buffers[i]); + } + } + } + } + + IMFMediaBuffer_SetCurrentLength(buffer, dst_current_length); + + if (locked) + IMFMediaBuffer_Unlock(buffer); + + LeaveCriticalSection(&sample->attributes.cs); + + return hr; } static const IMFSampleVtbl samplevtbl = diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 36fe9dc831..38713a4f44 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1760,12 +1760,14 @@ static void test_system_memory_buffer(void) static void test_sample(void) { + static const DWORD test_pattern = 0x22222222; IMFMediaBuffer *buffer, *buffer2; DWORD count, flags, length; IMFAttributes *attributes; IMFSample *sample; LONGLONG time; HRESULT hr; + BYTE *data; hr = MFCreateSample( &sample ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1868,6 +1870,94 @@ static void test_sample(void) IMFAttributes_Release(attributes); IMFSample_Release(sample); + /* CopyToBuffer() */ + hr = MFCreateSample(&sample); + ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr); + + hr = MFCreateMemoryBuffer(16, &buffer2); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + /* Sample with no buffers. */ + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 1); + ok(hr == S_OK, "Failed to set current length, hr %#x.\n", hr); + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get current length, hr %#x.\n", hr); + ok(!length, "Unexpected length %u.\n", length); + + /* Single buffer, larger destination. */ + hr = MFCreateMemoryBuffer(8, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + *(DWORD *)data = 0x11111111; + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "Failed to unlock, hr %#x.\n", hr); + hr = IMFMediaBuffer_SetCurrentLength(buffer, 4); + ok(hr == S_OK, "Failed to set current length, hr %#x.\n", hr); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + /* Existing content is overwritten. */ + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 8); + ok(hr == S_OK, "Failed to set length, hr %#x.\n", hr); + + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == S_OK, "Failed to copy to buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(length == 4, "Unexpected buffer length %u.\n", length); + + /* Multiple buffers, matching total size. */ + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "Failed to get buffer count, hr %#x.\n", hr); + ok(count == 2, "Unexpected buffer count %u.\n", count); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 8); + ok(hr == S_OK, "Failed to set current length, hr %#x.\n", hr); + + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == S_OK, "Failed to copy to buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(length == 16, "Unexpected buffer length %u.\n", length); + + hr = IMFSample_AddBuffer(sample, buffer); + ok(hr == S_OK, "Failed to add buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(buffer2, 1); + ok(hr == S_OK, "Failed to set buffer length, hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer2, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + *(DWORD *)data = test_pattern; + hr = IMFMediaBuffer_Unlock(buffer2); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IMFSample_CopyToBuffer(sample, buffer2); + ok(hr == MF_E_BUFFERTOOSMALL, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaBuffer_Lock(buffer2, &data, NULL, NULL); + ok(hr == S_OK, "Failed to lock buffer, hr %#x.\n", hr); + ok(!memcmp(data, &test_pattern, sizeof(test_pattern)), "Unexpected contents, %#x\n", *(DWORD *)data); + hr = IMFMediaBuffer_Unlock(buffer2); + ok(hr == S_OK, "Failed to unlock buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer2, &length); + ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); + ok(!length, "Unexpected buffer length %u.\n", length); + + IMFMediaBuffer_Release(buffer2); + IMFSample_Release(sample); + /* ConvertToContiguousBuffer() */ hr = MFCreateSample(&sample); ok(hr == S_OK, "Failed to create a sample, hr %#x.\n", hr);

1 0

Nikolay Sivov : mf: Implement IsMediaTypeSupported() for simple type handler.
by Alexandre Julliard March 10, 2020

March 10, 2020

Module: wine Branch: master Commit: d6e828d5f2464bc6fa459d01d30a7d52e84cc28c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e828d5f2464bc6fa459d01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 10 15:22:58 2020 +0300 mf: Implement IsMediaTypeSupported() for simple type handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 22 ++++++++++++-- dlls/mf/tests/mf.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 105 insertions(+), 5 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index f38558f82e..f16e3e8aba 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1342,9 +1342,27 @@ static ULONG WINAPI simple_type_handler_Release(IMFMediaTypeHandler *iface) static HRESULT WINAPI simple_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { - FIXME("%p, %p, %p.\n", iface, in_type, out_type); + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + DWORD flags = 0; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, in_type, out_type); + + if (out_type) + *out_type = NULL; + + EnterCriticalSection(&handler->cs); + if (!handler->media_type) + hr = MF_E_UNEXPECTED; + else + { + if (SUCCEEDED(hr = IMFMediaType_IsEqual(handler->media_type, in_type, &flags))) + hr = (flags & (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES)) == + (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES) ? S_OK : E_FAIL; + } + LeaveCriticalSection(&handler->cs); + + return hr; } static HRESULT WINAPI simple_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2dc5ad8f50..dcb20aff05 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2656,7 +2656,7 @@ static void test_evr(void) static void test_MFCreateSimpleTypeHandler(void) { - IMFMediaType *media_type, *media_type2; + IMFMediaType *media_type, *media_type2, *media_type3; IMFMediaTypeHandler *handler; DWORD count; HRESULT hr; @@ -2668,6 +2668,9 @@ static void test_MFCreateSimpleTypeHandler(void) hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); + ok(hr == MF_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + count = 0; hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); @@ -2684,6 +2687,9 @@ static void test_MFCreateSimpleTypeHandler(void) hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, NULL); + ok(hr == MF_E_UNEXPECTED, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); @@ -2692,6 +2698,15 @@ static void test_MFCreateSimpleTypeHandler(void) ok(media_type2 == media_type, "Unexpected type.\n"); IMFMediaType_Release(media_type2); + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type, &media_type2); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 1, &media_type2); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); @@ -2700,11 +2715,78 @@ static void test_MFCreateSimpleTypeHandler(void) ok(media_type == media_type2, "Unexpected pointer.\n"); IMFMediaType_Release(media_type2); - IMFMediaType_Release(media_type); - hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); + ok(IsEqualGUID(&guid, &MFMediaType_Video), "Unexpected major type.\n"); + + hr = MFCreateMediaType(&media_type3); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type3, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + /* Different major types. */ + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type3, &media_type2); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type3, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + /* Handler missing subtype. */ + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_SUBTYPE, &MFVideoFormat_RGB8); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type3, &media_type2); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + /* Different subtypes. */ + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFVideoFormat_RGB24); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type3, &media_type2); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + /* Same major/subtype. */ + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_SUBTYPE, &MFVideoFormat_RGB24); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type3, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + /* Set one more attribute. */ + hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)4 << 32 | 4); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, media_type3, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + IMFMediaType_Release(media_type3); + IMFMediaType_Release(media_type); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr);

1 0