wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Francois Gouget : testbot/UpdateTaskLogs: Fix the detection of Wine test reports.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: tools Branch: master Commit: 4711c9d740b2e06e96d91c729f0d9cfc8e4551dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=4711c9d740b2e06e96d91c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:53:32 2020 +0100 testbot/UpdateTaskLogs: Fix the detection of Wine test reports. We know a report come from a Wine test if the job was created for a patch. But the step that references the patch is not necessarily the task's parent step: it could also be the build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 94adf42..e50e449 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -286,9 +286,9 @@ sub MoveRefReport($$;$) return 0; } -sub ProcessTaskLogs($$$) +sub ProcessTaskLogs($$$$) { - my ($Step, $Task, $CollectOnly) = @_; + my ($Step, $Task, $IsWineTest, $CollectOnly) = @_; my $Rc = 0; my $ReportNames; @@ -418,12 +418,11 @@ sub ProcessTaskLogs($$$) { # And (re)build the .errors files, even if Status != 'completed' for # task.log and testbot.log. - my ($IsWineTest, $TaskTimedOut); + my $TaskTimedOut; if ($Task->Started and $Task->Ended) { my $Duration = $Task->Ended - $Task->Started; $TaskTimedOut = $Duration > $Task->Timeout; - $IsWineTest = ($Step->Type eq "patch" or $Step->Type eq "suite"); } foreach my $LogName (@{GetLogFileNames($TaskDir, "+old")}) { @@ -564,11 +563,14 @@ my $Jobs = CreateJobs(); foreach my $Task (sort { ($a->Ended || 0) <=> ($b->Ended || 0) } @AllTasks) { my ($JobId, $StepNo, $TaskNo) = @{$Task->GetMasterKey()}; - my $Step = $Jobs->GetItem($JobId)->Steps->GetItem($StepNo); + my $Steps = $Jobs->GetItem($JobId)->Steps; + my $Step = $Steps->GetItem($StepNo); + my $IsWineTest = $Step->FileType eq "patch" || + $Steps->GetItem(1)->FileType eq "patch"; my $CollectOnly = ((defined $OptJobId and $OptJobId ne $JobId) or (defined $OptStepNo and $OptStepNo ne $StepNo) or (defined $OptTaskNo and $OptTaskNo ne $TaskNo)); - $Rc += ProcessTaskLogs($Step, $Task, $CollectOnly); + $Rc += ProcessTaskLogs($Step, $Task, $IsWineTest, $CollectOnly); } exit $Rc ? 1 : 0;

1 0

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

11 Mar '20

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

Francois Gouget : testbot/PatchUtils: Escape dots in regular expressions.
by Alexandre Julliard 11 Mar '20

11 Mar '20

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

Jacek Caban : dbghelp: Search also real path location in path_find_symbol_file.
by Alexandre Julliard 10 Mar '20

10 Mar '20

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

Jacek Caban : dbghelp: Try loading builtin modules from unix installation.
by Alexandre Julliard 10 Mar '20

10 Mar '20

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 10 Mar '20

10 Mar '20

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

Paul Gofman : ntdll: Zero init reg_tzi in find_reg_tz_info().
by Alexandre Julliard 10 Mar '20

10 Mar '20

Module: wine Branch: master Commit: 3f0cbf4691450a3acfbec1aa48e08475cb9d7196 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f0cbf4691450a3acfbec1aa… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Mar 9 21:54:23 2020 +0300 ntdll: Zero init reg_tzi in find_reg_tz_info(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48694 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 1d5c4f2b31..2b6b9c061c 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -797,6 +797,8 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char* continue; \ } + memset(&reg_tzi, 0, sizeof(reg_tzi)); + if (!reg_query_value(hSubkey, mui_stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName))) get_value(hSubkey, stdW, REG_SZ, reg_tzi.StandardName, sizeof(reg_tzi.StandardName)); if (!reg_query_value(hSubkey, mui_dltW, REG_SZ, reg_tzi.DaylightName, sizeof(reg_tzi.DaylightName)))

1 0

Nikolay Sivov : mf: Implement MFGetTopoNodeCurrentType().
by Alexandre Julliard 10 Mar '20

10 Mar '20

Module: wine Branch: master Commit: 82eecc50b5761a981847d86ba8347316348f191a URL: https://source.winehq.org/git/wine.git/?a=commit;h=82eecc50b5761a981847d86b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 10 15:23:00 2020 +0300 mf: Implement MFGetTopoNodeCurrentType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/topology.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 168 insertions(+), 1 deletion(-) diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 1c3fc9c953..4b5b085d08 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -75,7 +75,7 @@ @ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) @ stdcall MFGetSupportedSchemes(ptr) -@ stub MFGetTopoNodeCurrentType +@ stdcall MFGetTopoNodeCurrentType(ptr long long ptr) @ stub MFReadSequencerSegmentOffset @ stub MFRequireProtectedEnvironment @ stdcall MFShutdownObject(ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dcb20aff05..da533d05d3 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3103,6 +3103,86 @@ static void test_sample_copier(void) IMFTransform_Release(copier); } +static void test_MFGetTopoNodeCurrentType(void) +{ + IMFMediaType *media_type, *media_type2; + IMFTopologyNode *node; + HRESULT hr; + + /* Tee node. */ + hr = MFCreateTopologyNode(MF_TOPOLOGY_TEE_NODE, &node); + ok(hr == S_OK, "Failed to create a node, hr %#x.\n", hr); + + hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = MFCreateMediaType(&media_type2); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + /* Input type returned, if set. */ + hr = IMFTopologyNode_SetInputPrefType(node, 0, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type); + + hr = IMFTopologyNode_SetInputPrefType(node, 0, NULL); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* Set second output. */ + hr = IMFTopologyNode_SetOutputPrefType(node, 1, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyNode_SetOutputPrefType(node, 1, NULL); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + /* Set first output. */ + hr = IMFTopologyNode_SetOutputPrefType(node, 0, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type); + + hr = IMFTopologyNode_SetOutputPrefType(node, 0, NULL); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + /* Set primary output. */ + hr = IMFTopologyNode_SetOutputPrefType(node, 1, media_type2); + ok(hr == S_OK, "Failed to set media type, hr %#x.\n", hr); + + hr = IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_PRIMARYOUTPUT, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFGetTopoNodeCurrentType(node, 0, FALSE, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type); + + hr = MFGetTopoNodeCurrentType(node, 0, TRUE, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type); + + IMFTopologyNode_Release(node); + IMFMediaType_Release(media_type2); +} + START_TEST(mf) { test_topology(); @@ -3121,4 +3201,5 @@ START_TEST(mf) test_MFGetSupportedMimeTypes(); test_MFGetSupportedSchemes(); test_sample_copier(); + test_MFGetTopoNodeCurrentType(); } diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index db82816328..67afba6ba4 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1786,6 +1786,91 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } +/*********************************************************************** + * MFGetTopoNodeCurrentType (mf.@) + */ +HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) +{ + IMFMediaTypeHandler *type_handler; + MF_TOPOLOGY_TYPE node_type; + IMFStreamSink *stream_sink; + IMFStreamDescriptor *sd; + IMFTransform *transform; + UINT32 primary_output; + IUnknown *object; + HRESULT hr; + + TRACE("%p, %u, %d, %p.\n", node, stream, output, type); + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + return hr; + + switch (node_type) + { + case MF_TOPOLOGY_OUTPUT_NODE: + if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) + return hr; + + hr = IUnknown_QueryInterface(object, &IID_IMFStreamSink, (void **)&stream_sink); + IUnknown_Release(object); + if (SUCCEEDED(hr)) + { + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); + IMFStreamSink_Release(stream_sink); + + if (SUCCEEDED(hr)) + { + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, type); + IMFMediaTypeHandler_Release(type_handler); + } + } + break; + case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, &IID_IMFStreamDescriptor, + (void **)&sd))) + { + return hr; + } + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &type_handler); + IMFStreamDescriptor_Release(sd); + if (SUCCEEDED(hr)) + { + hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, type); + IMFMediaTypeHandler_Release(type_handler); + } + break; + case MF_TOPOLOGY_TRANSFORM_NODE: + if (FAILED(hr = IMFTopologyNode_GetObject(node, &object))) + return hr; + + hr = IUnknown_QueryInterface(object, &IID_IMFTransform, (void **)&transform); + IUnknown_Release(object); + if (SUCCEEDED(hr)) + { + if (output) + hr = IMFTransform_GetOutputCurrentType(transform, stream, type); + else + hr = IMFTransform_GetInputCurrentType(transform, stream, type); + IMFTransform_Release(transform); + } + break; + case MF_TOPOLOGY_TEE_NODE: + if (SUCCEEDED(hr = IMFTopologyNode_GetInputPrefType(node, 0, type))) + break; + + if (FAILED(IMFTopologyNode_GetUINT32(node, &MF_TOPONODE_PRIMARYOUTPUT, &primary_output))) + primary_output = 0; + + hr = IMFTopologyNode_GetOutputPrefType(node, primary_output, type); + break; + default: + ; + } + + return hr; +} + static HRESULT WINAPI topology_loader_QueryInterface(IMFTopoLoader *iface, REFIID riid, void **out) { TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); diff --git a/include/mfidl.idl b/include/mfidl.idl index cf04ec17ce..60337f8106 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -609,6 +609,7 @@ cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetSupportedSchemes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") cpp_quote("MFTIME WINAPI MFGetSystemTime(void);") +cpp_quote("HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type);") cpp_quote("HRESULT WINAPI MFShutdownObject(IUnknown *object);") typedef enum _MFMEDIASOURCE_CHARACTERISTICS

1 0

Nikolay Sivov : mfplat: Implement IsMediaTypeSupported() for stream descriptor.
by Alexandre Julliard 10 Mar '20

10 Mar '20

Module: wine Branch: master Commit: 3e1cfb3dd82a3f977e30f466cb7ec9b3fa308823 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e1cfb3dd82a3f977e30f466… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 10 15:22:59 2020 +0300 mfplat: Implement IsMediaTypeSupported() for stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 39 +++++++++++++- dlls/mfplat/tests/mfplat.c | 126 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 6b67f5b33c..8378e24196 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1038,12 +1038,47 @@ static ULONG WINAPI mediatype_handler_Release(IMFMediaTypeHandler *iface) return IMFStreamDescriptor_Release(&stream_desc->IMFStreamDescriptor_iface); } +static BOOL stream_descriptor_is_mediatype_supported(IMFMediaType *media_type, IMFMediaType *candidate) +{ + DWORD flags = 0; + + if (FAILED(IMFMediaType_IsEqual(media_type, candidate, &flags))) + return FALSE; + + return (flags & (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES)) == + (MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES); +} + static HRESULT WINAPI mediatype_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, IMFMediaType **out_type) { - FIXME("%p, %p, %p.\n", iface, in_type, out_type); + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); + BOOL supported = FALSE; + unsigned int i; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, in_type, out_type); + + if (!in_type) + return E_POINTER; + + if (out_type) + *out_type = NULL; + + EnterCriticalSection(&stream_desc->attributes.cs); + + supported = stream_desc->current_type && stream_descriptor_is_mediatype_supported(stream_desc->current_type, in_type); + if (!supported) + { + for (i = 0; i < stream_desc->media_types_count; ++i) + { + if ((supported = stream_descriptor_is_mediatype_supported(stream_desc->media_types[i], in_type))) + break; + } + } + + LeaveCriticalSection(&stream_desc->attributes.cs); + + return supported ? S_OK : MF_E_INVALIDMEDIATYPE; } static HRESULT WINAPI mediatype_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 38713a4f44..97108e1478 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3164,7 +3164,7 @@ static void test_MFInvokeCallback(void) static void test_stream_descriptor(void) { - IMFMediaType *media_types[2], *media_type; + IMFMediaType *media_types[2], *media_type, *media_type2, *media_type3; IMFMediaTypeHandler *type_handler; IMFStreamDescriptor *stream_desc; GUID major_type; @@ -3217,12 +3217,36 @@ static void test_stream_descriptor(void) hr = IMFMediaTypeHandler_GetMediaTypeByIndex(type_handler, 2, &media_type); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + /* IsMediaTypeSupported() */ + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, NULL, &media_type2); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = MFCreateMediaType(&media_type3); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type); ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + hr = IMFMediaTypeHandler_GetMajorType(type_handler, &major_type); ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); @@ -3233,11 +3257,111 @@ static void test_stream_descriptor(void) ok(hr == S_OK, "Failed to get major type, hr %#x.\n", hr); ok(IsEqualGUID(&major_type, &MFMediaType_Audio), "Unexpected major type.\n"); + /* Mismatching major types. */ + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set major type, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + /* Subtype missing. */ + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + /* Mismatching subtype. */ + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_SUBTYPE, &MFAudioFormat_MP3); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + hr = IMFMediaTypeHandler_GetMediaTypeCount(type_handler, &count); ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); ok(count == ARRAY_SIZE(media_types), "Unexpected type count.\n"); + IMFMediaTypeHandler_Release(type_handler); + IMFStreamDescriptor_Release(stream_desc); + + /* IsMediaTypeSupported() for unset current type. */ + hr = MFCreateStreamDescriptor(123, ARRAY_SIZE(media_types), media_types, &stream_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamDescriptor_GetMediaTypeHandler(stream_desc, &type_handler); + ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, NULL); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + /* Initialize one from initial type set. */ + hr = IMFMediaType_CopyAllItems(media_type3, (IMFAttributes *)media_types[0]); + ok(hr == S_OK, "Failed to copy attributes, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to copy attributes, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_SUBTYPE, &MFAudioFormat_MP3); + ok(hr == S_OK, "Failed to copy attributes, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + /* Now set current type that's not compatible. */ + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to copy attributes, hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type3, &MF_MT_SUBTYPE, &MFVideoFormat_RGB8); + ok(hr == S_OK, "Failed to copy attributes, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, media_type3); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type3, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + + hr = IMFMediaType_CopyAllItems(media_types[0], (IMFAttributes *)media_type); + ok(hr == S_OK, "Failed to copy attributes, hr %#x.\n", hr); + + media_type2 = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_IsMediaTypeSupported(type_handler, media_type, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type2, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type); + IMFMediaType_Release(media_type3); IMFMediaTypeHandler_Release(type_handler);

1 0

Nikolay Sivov : mf: Implement IsMediaTypeSupported() for simple type handler.
by Alexandre Julliard 10 Mar '20

10 Mar '20

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020