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

Alexandre Julliard : krnl386: Use stricmp() instead of _strnicmp(..., -1).
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 373973c9e955e7bec1b76978c32e2cc9f4884e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=373973c9e955e7bec1b76978… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 14:25:22 2020 +0200 krnl386: Use stricmp() instead of _strnicmp(..., -1). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 4 ++-- dlls/krnl386.exe16/relay.c | 4 ++-- dlls/krnl386.exe16/resource.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 822a5df4c3..88485372ff 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1462,7 +1462,7 @@ HMODULE16 WINAPI GetModuleHandle16( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!_strnicmp(loadedfn, s, -1)) + if (!stricmp(loadedfn, s)) return hModule; } return 0; @@ -1782,7 +1782,7 @@ static HMODULE16 NE_GetModuleByFilename( LPCSTR name ) loadedfn--; } /* case insensitive compare ... */ - if (!_strnicmp(loadedfn, s, -1)) + if (!stricmp(loadedfn, s)) return hModule; } /* If basename (without ext) matches the module name of a module: diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c index 3543898d79..6eab9970a9 100644 --- a/dlls/krnl386.exe16/relay.c +++ b/dlls/krnl386.exe16/relay.c @@ -179,11 +179,11 @@ static BOOL check_list( const char *module, int ordinal, const char *func, const if (_strnicmp( module, *list, len-1 ) || module[len]) continue; if (p[1] == '*' && !p[2]) return TRUE; if (!strcmp( ord_str, p + 1 )) return TRUE; - if (func && !_strnicmp( func, p + 1, -1 )) return TRUE; + if (func && !stricmp( func, p + 1 )) return TRUE; } else /* function only */ { - if (func && !_strnicmp( func, *list, -1 )) return TRUE; + if (func && !stricmp( func, *list )) return TRUE; } } return FALSE; diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index 0be9e2906e..c303e25a2d 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -209,7 +209,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[1] & 0x8000) { if (!HIWORD(typeId)) continue; - if (_strnicmp( typeId, (char *)(p + 3), -1 )) continue; + if (stricmp( typeId, (char *)(p + 3) )) continue; } else if (HIWORD(typeId) || (((DWORD)typeId & ~0x8000)!= p[1])) continue; @@ -219,7 +219,7 @@ static DWORD NE_FindNameTableId( NE_MODULE *pModule, LPCSTR typeId, LPCSTR resId if (p[2] & 0x8000) { if (!HIWORD(resId)) continue; - if (_strnicmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1, -1 )) continue; + if (stricmp( resId, (char*)(p+3)+strlen((char*)(p+3))+1 )) continue; } else if (HIWORD(resId) || ((LOWORD(resId) & ~0x8000) != p[2]))

1 0

Brendan Shanks : winevulkan: Enable VK_KHR_get_surface_capabilities2.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 086c686e817a596e35c41dd5b37f3c28587af9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086c686e817a596e35c41dd5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 6 16:58:40 2020 -0700 winevulkan: Enable VK_KHR_get_surface_capabilities2. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 32 ++++++++++++++++++++++ dlls/winevulkan/make_vulkan | 7 +++-- dlls/winevulkan/vulkan_thunks.c | 46 +++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 20 ++++++++++++++ dlls/winex11.drv/vulkan.c | 60 +++++++++++++++++++++++++++++++++++++++++ include/wine/vulkan.h | 38 +++++++++++++++++++++++--- include/wine/vulkan_driver.h | 8 +++++- 7 files changed, 204 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=086c686e817a596e35c4…

1 0

Jacek Caban : dbghelp: Get rid of no longer needed #ifdefs.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: e014d325ddb87dbb4678ef47ef17f9e7f49b0248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e014d325ddb87dbb4678ef47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:15 2020 +0200 dbghelp: Get rid of no longer needed #ifdefs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stabs.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index e14e154cba..b1b4a6ef1c 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -51,33 +51,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_stabs); /* Masks for n_type field */ -#ifndef N_STAB #define N_STAB 0xe0 -#endif -#ifndef N_PEXT #define N_PEXT 0x10 -#endif -#ifndef N_TYPE #define N_TYPE 0x1e -#endif -#ifndef N_EXT #define N_EXT 0x01 -#endif /* Values for (n_type & N_TYPE) */ -#ifndef N_UNDF #define N_UNDF 0x00 -#endif -#ifndef N_ABS #define N_ABS 0x02 -#endif -#ifndef N_INDR #define N_INDR 0x0a -#endif -#ifndef N_SECT #define N_SECT 0x0e -#endif - #define N_GSYM 0x20 #define N_FUN 0x24 #define N_STSYM 0x26

1 0

Jacek Caban : dbghelp: Get rid of no longer needed HAVE_ZLIB checks.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 6b1bc0beac510aa48a848b8182b9310f92609dd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1bc0beac510aa48a848b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 6 23:42:01 2020 +0200 dbghelp: Get rid of no longer needed HAVE_ZLIB checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5925a00bfe..53274c4f59 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3363,7 +3363,6 @@ static void dwarf2_location_compute(struct process* pcs, } } -#ifdef HAVE_ZLIB static void *zalloc(void *priv, uInt items, uInt sz) { return HeapAlloc(GetProcessHeap(), 0, items * sz); @@ -3445,8 +3444,6 @@ out: return ret; } -#endif - static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_file_map* fmap, const char* sectname, const char* zsectname, struct image_section_map* ism) @@ -3470,11 +3467,7 @@ static inline BOOL dwarf2_init_section(dwarf2_section_t* section, struct image_f if (zsectname && image_find_section(fmap, zsectname, ism)) { -#ifdef HAVE_ZLIB return dwarf2_init_zsection(section, zsectname, ism); -#else - FIXME("dbghelp not built with zlib, but compressed section found\n" ); -#endif } return FALSE;

1 0

Chip Davis : opencl: Build with CL_SILENCE_DEPRECATION.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 913413890443fac3b6863e7292829b4d9daa6bc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=913413890443fac3b6863e72… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:04:24 2020 -0500 opencl: Build with CL_SILENCE_DEPRECATION. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 7e680ba057..06b8d78a40 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -30,6 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); +#define CL_SILENCE_DEPRECATION #if defined(HAVE_CL_CL_H) #define CL_USE_DEPRECATED_OPENCL_1_1_APIS #define CL_USE_DEPRECATED_OPENCL_1_2_APIS

1 0

Francois Gouget : testbot/build: Don't compile Wine with -Werror.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: tools Branch: master Commit: 360bd7fd13f65ac3fc43311b778de62dad5c2a2b URL: https://source.winehq.org/git/tools.git/?a=commit;h=360bd7fd13f65ac3fc43311… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:49:55 2020 +0200 testbot/build: Don't compile Wine with -Werror. While the mailing list patches should be compiled with -Werror, the manually submitted jobs should be given more leeway so developers are not hampered when just doing a quick test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 1 - testbot/bin/build/WineReconfig.pl | 1 - 2 files changed, 2 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index b72fa73..458b5da 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -55,7 +55,6 @@ sub UpdateWineBuilds($$) { my ($TaskMissions, $Flags) = @_; - $Flags |= $Build::Utils::TRY_WERROR; my $Configure = "--without-x --without-freetype --disable-winetest"; return BuildWine($TaskMissions, $Flags, "exe32", $Configure, "buildtests") && diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 0c64fc3..f9f6792 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,7 +54,6 @@ sub UpdateWineBuilds($$) { my ($TaskMissions, $Flags) = @_; - $Flags |= $Build::Utils::TRY_WERROR; return BuildWine($TaskMissions, $Flags, "win32", "") && BuildWine($TaskMissions, $Flags, "wow64", "--enable-win64") && BuildWine($TaskMissions, $Flags, "wow32", "--with-wine64=".

1 0

Francois Gouget : testbot/Janitor: Allow 31 character session ids.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: tools Branch: master Commit: 7171288cf54f9cb7d6b236867022df7ea4dde8c1 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7171288cf54f9cb7d6b2368… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 7 01:50:03 2020 +0200 testbot/Janitor: Allow 31 character session ids. Some users still have obsolete 31 character session ids that have not expired yet. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 8fa1782..35a7e5d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -272,7 +272,8 @@ if (opendir(my $dh, "$DataDir/staging")) my $Age = int((-M $FileName) + 0.5); my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry =~ /^[0-9a-f]{32}-websubmit2?_/) + # FIXME: There are still some obsolete unexpired 31 characters session ids. + if ($Entry =~ /^[0-9a-f]{31,32}-websubmit2?_/) { # We get these files whenever a developer abandons a job submission. # So just delete them silently after a day.

1 0

Nikolay Sivov : mfreadwrite: Add support for seeking in Source Reader.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: f540d1615fe66c95a3824e86e5292a026511749e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f540d1615fe66c95a3824e86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 6 17:19:30 2020 +0300 mfreadwrite: Add support for seeking in Source Reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 147 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 115 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f540d1615fe66c95a382…

1 0

Andrew Eikum : kernel32/tests: Actually run OpenFile tests.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 2cd776fffdf7a85dcfe13fdef70a1c817ef83dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd776fffdf7a85dcfe13fde… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 6 11:00:07 2020 -0500 kernel32/tests: Actually run OpenFile tests. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index e8a31c6e74..29620654bd 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3352,17 +3352,6 @@ static void test_OpenFile(void) ofs.szPathName ); } - length = GetCurrentDirectoryA(MAX_PATH, buff) + sizeof(filename); - - if (length >= MAX_PATH) - { - trace("Buffer too small, requested length = %d, but MAX_PATH = %d. Skipping test.\n", length, MAX_PATH); - return; - } - p = buff + strlen(buff); - if (p > buff && p[-1] != '\\') *p++ = '\\'; - strcpy( p, filename ); - memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); /* Create an empty file */ @@ -3389,8 +3378,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3404,8 +3393,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3419,8 +3408,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); ret = _lclose(hFile); ok( !ret, "_lclose() returns %d\n", ret ); @@ -3434,8 +3423,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); memset(&ofs, 0xA5, sizeof(ofs)); SetLastError(0xfaceabee); @@ -3447,8 +3436,8 @@ static void test_OpenFile(void) ok( ofs.cBytes == sizeof(OFSTRUCT), "OpenFile set ofs.cBytes to %d\n", ofs.cBytes ); ok( ofs.nErrCode == ERROR_SUCCESS || broken(ofs.nErrCode != ERROR_SUCCESS) /* win9x */, "OpenFile set ofs.nErrCode to %d\n", ofs.nErrCode ); - ok( lstrcmpiA(ofs.szPathName, buff) == 0, - "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, buff ); + ok( lstrcmpiA(ofs.szPathName, filename) == 0, + "OpenFile returned '%s', but was expected to return '%s'\n", ofs.szPathName, filename ); retval = GetFileAttributesA(filename); ok( retval == INVALID_FILE_ATTRIBUTES, "GetFileAttributesA succeeded on deleted file\n" );

1 0

Jactry Zeng : qasf: Implement IFileSourceFilter stub for WM ASF reader.
by Alexandre Julliard April 6, 2020

April 6, 2020

Module: wine Branch: master Commit: 5e38ba09e774ae551d099807041433359865e07b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e38ba09e774ae551d099807… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Apr 6 11:54:06 2020 -0500 qasf: Implement IFileSourceFilter stub for WM ASF reader. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/asfreader.c | 71 +++++++++++++++++++++++++++++++++++++++++++++ dlls/qasf/tests/asfreader.c | 2 +- 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index e5dbd1d052..6d4a05a723 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); struct asf_reader { struct strmbase_filter filter; + IFileSourceFilter IFileSourceFilter_iface; }; static inline struct asf_reader *impl_reader_from_strmbase_filter(struct strmbase_filter *iface) @@ -45,10 +46,79 @@ static void asf_reader_destroy(struct strmbase_filter *iface) free(filter); } +static HRESULT asf_reader_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) +{ + struct asf_reader *filter = impl_reader_from_strmbase_filter(iface); + + if (IsEqualGUID(iid, &IID_IFileSourceFilter)) + { + *out = &filter->IFileSourceFilter_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static struct strmbase_filter_ops filter_ops = { .filter_get_pin = asf_reader_get_pin, .filter_destroy = asf_reader_destroy, + .filter_query_interface = asf_reader_query_interface, +}; + +static inline struct asf_reader *impl_from_IFileSourceFilter(IFileSourceFilter *iface) +{ + return CONTAINING_RECORD(iface, struct asf_reader, IFileSourceFilter_iface); +} + +static HRESULT WINAPI filesourcefilter_QueryInterface(IFileSourceFilter *iface, REFIID iid, void **out) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, iid, out); +} + +static ULONG WINAPI filesourcefilter_AddRef(IFileSourceFilter *iface) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + return IBaseFilter_AddRef(&filter->filter.IBaseFilter_iface); +} + +static ULONG WINAPI filesourcefilter_Release(IFileSourceFilter *iface) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + return IBaseFilter_Release(&filter->filter.IBaseFilter_iface); +} + +static HRESULT WINAPI filesourcefilter_Load(IFileSourceFilter *iface, LPCOLESTR filename, const AM_MEDIA_TYPE *type) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + FIXME("filter %p, filename %s, type %p, stub!\n", filter, debugstr_w(filename), type); + strmbase_dump_media_type(type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI filesourcefilter_GetCurFile(IFileSourceFilter *iface, LPOLESTR *filename, AM_MEDIA_TYPE *type) +{ + struct asf_reader *filter = impl_from_IFileSourceFilter(iface); + + FIXME("filter %p, filename %p, type %p, stub!\n", filter, filename, type); + + return E_NOTIMPL; +} + +static const IFileSourceFilterVtbl filesourcefilter_vtbl = +{ + filesourcefilter_QueryInterface, + filesourcefilter_AddRef, + filesourcefilter_Release, + filesourcefilter_Load, + filesourcefilter_GetCurFile, }; HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) @@ -59,6 +129,7 @@ HRESULT asf_reader_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; strmbase_filter_init(&object->filter, outer, &CLSID_WMAsfReader, &filter_ops); + object->IFileSourceFilter_iface.lpVtbl = &filesourcefilter_vtbl; TRACE("Created WM ASF reader %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qasf/tests/asfreader.c b/dlls/qasf/tests/asfreader.c index 9098d5cfdf..607b1ca597 100644 --- a/dlls/qasf/tests/asfreader.c +++ b/dlls/qasf/tests/asfreader.c @@ -71,7 +71,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); - todo_wine check_interface(filter, &IID_IFileSourceFilter, TRUE); + check_interface(filter, &IID_IFileSourceFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); check_interface(filter, &IID_IUnknown, TRUE);

1 0