February 2020 - Wine-commits

Jacek Caban : stdio.h: Add snprintf inline wrapper.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 0eb79209d14624173b9354e020d70a52ac45a1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eb79209d14624173b9354e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 15:21:02 2020 +0100 stdio.h: Add snprintf inline wrapper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 8a31835bea..2a66f008fa 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -192,7 +192,17 @@ static inline int unlink(const char* path) { return _unlink(path); } #define _UNLINK_DEFINED #endif static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } -#define snprintf _snprintf + +static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = vsnprintf(buffer, size, format, args); + __ms_va_end(args); + return ret; +} static inline int WINAPIV _snprintf(char *buffer, size_t size, const char *format, ...) {

1 0

Jacek Caban : makedep: Define _UCRT in modules that link to ucrtbase.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 229c33791f0a4690f01550d7138b038d52f17f7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=229c33791f0a4690f01550d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 15:21:13 2020 +0100 makedep: Define _UCRT in modules that link to ucrtbase. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1e33b1c673..6dec1b3900 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4172,7 +4172,7 @@ static void load_sources( struct makefile *make ) "MANPAGES", NULL }; - const char **var; + const char **var, *crt_dll = NULL; unsigned int i; struct strarray value; struct incl_file *file; @@ -4265,11 +4265,23 @@ static void load_sources( struct makefile *make ) make->is_cross = crosstarget && make->use_msvcrt; + if (make->use_msvcrt) + { + for (i = 0; i < make->imports.count; i++) + { + if (strncmp( make->imports.str[i], "msvcr", 5 ) && strncmp( make->imports.str[i], "ucrt", 4 )) continue; + if (crt_dll) fatal_error( "More than one crt DLL imported: %s %s\n", crt_dll, make->imports.str[i] ); + crt_dll = make->imports.str[i]; + } + if (!crt_dll) crt_dll = "msvcrt"; + if (!strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); + } + if (make->is_cross) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); - if (make->use_msvcrt) strarray_add_uniq( &cross_import_libs, "msvcrt" ); + if (crt_dll) strarray_add_uniq( &cross_import_libs, crt_dll ); if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" );

1 0

Jacek Caban : stdio.h: Add ucrt version of vsnprintf inline wrapper.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: c60b21926ef2966835483d7f06202e33569c091f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c60b21926ef2966835483d7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 18 15:21:29 2020 +0100 stdio.h: Add ucrt version of vsnprintf inline wrapper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/misc.c | 10 ---------- include/msvcrt/stdio.h | 27 +++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/vcruntime140/misc.c b/dlls/vcruntime140/misc.c index 028bde5b3d..cc64175438 100644 --- a/dlls/vcruntime140/misc.c +++ b/dlls/vcruntime140/misc.c @@ -22,10 +22,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcruntime); -#define UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR (0x0002) -int __cdecl __stdio_common_vsprintf(unsigned __int64 options, char *str, size_t len, const char *format, - _locale_t locale, __ms_va_list valist); - int* CDECL __processing_throw(void); /********************************************************************* @@ -58,9 +54,3 @@ int __cdecl __uncaught_exceptions(void) { return *__processing_throw(); } - -int __cdecl _vsnprintf( char *buf, size_t size, const char *fmt, __ms_va_list args ) -{ - return __stdio_common_vsprintf( UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, - buf, size, fmt, NULL, args ); -} diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 2a66f008fa..7477ac171a 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -95,7 +95,6 @@ char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); -int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); @@ -173,6 +172,31 @@ int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); +#ifdef _UCRT + +_ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); + +static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int __cdecl _vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, + buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +#else /* _UCRT */ + +int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); +static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } + +#endif /* _UCRT */ + #endif /* _STDIO_DEFINED */ #ifdef __cplusplus @@ -191,7 +215,6 @@ static inline char* tempnam(const char *dir, const char *prefix) { return _tempn static inline int unlink(const char* path) { return _unlink(path); } #define _UNLINK_DEFINED #endif -static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } static inline int WINAPIV snprintf(char *buffer, size_t size, const char *format, ...) {

1 0

Piotr Caban : dbghelp: Support 32 and 64-bit binaries in ImageDirectoryEntryToDataEx.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: ab4c64a4093b98ca7a74ec29a9d947333791b26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4c64a4093b98ca7a74ec29… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 18 17:01:59 2020 +0100 dbghelp: Support 32 and 64-bit binaries in ImageDirectoryEntryToDataEx. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 4b7c7baaae..b046b987bd 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -853,11 +853,25 @@ PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, if (section) *section = NULL; if (!(nt = RtlImageNtHeader( base ))) return NULL; - if (dir >= nt->OptionalHeader.NumberOfRvaAndSizes) return NULL; - if (!(addr = nt->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + const IMAGE_NT_HEADERS64 *nt64 = (const IMAGE_NT_HEADERS64 *)nt; - *size = nt->OptionalHeader.DataDirectory[dir].Size; - if (image || addr < nt->OptionalHeader.SizeOfHeaders) return (char *)base + addr; + if (dir >= nt64->OptionalHeader.NumberOfRvaAndSizes) return NULL; + if (!(addr = nt64->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; + *size = nt64->OptionalHeader.DataDirectory[dir].Size; + if (image || addr < nt64->OptionalHeader.SizeOfHeaders) return (char *)base + addr; + } + else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + const IMAGE_NT_HEADERS32 *nt32 = (const IMAGE_NT_HEADERS32 *)nt; + + if (dir >= nt32->OptionalHeader.NumberOfRvaAndSizes) return NULL; + if (!(addr = nt32->OptionalHeader.DataDirectory[dir].VirtualAddress)) return NULL; + *size = nt32->OptionalHeader.DataDirectory[dir].Size; + if (image || addr < nt32->OptionalHeader.SizeOfHeaders) return (char *)base + addr; + } + else return NULL; return RtlImageRvaToVa( nt, base, addr, section ); }

1 0

Piotr Caban : dbghelp: Use RtlImageDirectoryEntryToData in pe_load_msc_debug_info.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 7e16acf3806f9e810884d710c640f5f82c158093 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e16acf3806f9e810884d710… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 18 17:02:06 2020 +0100 dbghelp: Use RtlImageDirectoryEntryToData in pe_load_msc_debug_info. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/pe_module.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index b046b987bd..0f00b684ba 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -572,19 +572,15 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* mod { struct image_file_map* fmap = &module->format_info[DFI_PE]->u.pe_info->fmap; BOOL ret = FALSE; - const IMAGE_DATA_DIRECTORY* dir; - const IMAGE_DEBUG_DIRECTORY*dbg = NULL; - int nDbg; + const IMAGE_DEBUG_DIRECTORY*dbg; + ULONG nDbg; void* mapping; IMAGE_NT_HEADERS* nth; if (!(mapping = pe_map_full(fmap, &nth))) return FALSE; /* Read in debug directory */ - dir = nth->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_DEBUG; - nDbg = dir->Size / sizeof(IMAGE_DEBUG_DIRECTORY); - if (!nDbg) goto done; - - dbg = RtlImageRvaToVa(nth, mapping, dir->VirtualAddress, NULL); + dbg = RtlImageDirectoryEntryToData( mapping, FALSE, IMAGE_DIRECTORY_ENTRY_DEBUG, &nDbg ); + if (!dbg || !(nDbg /= sizeof(IMAGE_DEBUG_DIRECTORY))) goto done; /* Parse debug directory */ if (nth->FileHeader.Characteristics & IMAGE_FILE_DEBUG_STRIPPED)

1 0

Liam Middlebrook : winevulkan: Fix two spelling errors in make_vulkan.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 35a0154eba4d4605b99e1b46789d00622236bc37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a0154eba4d4605b99e1b46… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Feb 17 15:14:52 2020 -0800 winevulkan: Fix two spelling errors in make_vulkan. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Robert Morell <rmorell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 52ef25948c..3593410041 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -296,7 +296,7 @@ class VkDefine(object): # Perform minimal parsing for Vulkan constants, which we don't need, but are referenced # elsewhere in vk.xml. # - VK_API_VERSION is a messy, deprecated constant and we don't want generate code for it. - # - AHardwareBuffer/ANativeWindow are forard declarations for Android types, which leaked + # - AHardwareBuffer/ANativeWindow are forward declarations for Android types, which leaked # into the define region. if name in ["VK_API_VERSION", "AHardwareBuffer", "ANativeWindow", "CAMetalLayer"]: return VkDefine(name, None) @@ -2729,7 +2729,7 @@ class VkRegistry(object): VkRegistry._require_type(member.type_info["data"]) def _parse_extensions(self, root): - """ Parse extensions section and pull in any types and commands for this extensioin. """ + """ Parse extensions section and pull in any types and commands for this extension. """ extensions = [] exts = root.findall("./extensions/extension") for ext in exts:

1 0

Zebediah Figura : include: Add dmodshow.idl and IDMOWrapperFilter.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: d0a0505d38bb6f8860cc7bd4f7b7ea6501217996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a0505d38bb6f8860cc7bd4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:55 2020 -0600 include: Add dmodshow.idl and IDMOWrapperFilter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmoguids/dmoguids.c | 1 + include/Makefile.in | 1 + include/dmodshow.idl | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/dmoguids/dmoguids.c b/dlls/dmoguids/dmoguids.c index b764c1f74f..15a0540170 100644 --- a/dlls/dmoguids/dmoguids.c +++ b/dlls/dmoguids/dmoguids.c @@ -25,3 +25,4 @@ #include "mediaobj.h" #include "dmoreg.h" +#include "dmodshow.h" diff --git a/include/Makefile.in b/include/Makefile.in index 0e5dd475e0..21b4233ecd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -212,6 +212,7 @@ SOURCES = \ dmerror.h \ dmksctrl.h \ dmo.h \ + dmodshow.idl \ dmoreg.h \ dmort.h \ dmplugin.h \ diff --git a/include/dmodshow.idl b/include/dmodshow.idl new file mode 100644 index 0000000000..986b6c1ec3 --- /dev/null +++ b/include/dmodshow.idl @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2018 Zebediah Figura + * + * 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 + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "mediaobj.idl"; + +cpp_quote("DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xbd82,0x4dfd,0xb0,0xde,0x81,0x77,0x73,0x9c,0x6d,0x20);") +cpp_quote("DEFINE_GUID(CLSID_DMOFilterCategory,0xbcd5796c,0xbd52,0x4d30,0xab,0x76,0x70,0xf9,0x75,0xb8,0x91,0x99);") + +[ + object, + uuid(52d6f586-9f0f-4824-8fc8-e32ca04930c2), +] +interface IDMOWrapperFilter : IUnknown +{ + HRESULT Init(REFCLSID clsid, REFCLSID category); +}

1 0

Zebediah Figura : include: Add IDMOQualityControl and IDMOVideoOutputOptimizations.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 3f3fb557d274a3444117ebe7890d4949f2f53578 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3fb557d274a3444117ebe7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:56 2020 -0600 include: Add IDMOQualityControl and IDMOVideoOutputOptimizations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mediaobj.idl | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 7759921485..793e1bcf8e 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -21,9 +21,6 @@ import "unknwn.idl"; import "objidl.idl"; import "strmif.idl"; -interface IDMOQualityControl; -interface IDMOVideoOutputOptimizations; - typedef struct _DMOMediaType { GUID majortype; @@ -252,3 +249,38 @@ interface IMediaObjectInPlace : IUnknown { [out] REFERENCE_TIME *pLatencyTime ); } + +enum _DMO_QUALITY_STATUS_FLAGS +{ + DMO_QUALITY_STATUS_ENABLED = 0x00000001, +}; + +[ + object, + uuid(65abea96-cf36-453f-af8a-705e98f16260), + local +] +interface IDMOQualityControl : IUnknown +{ + HRESULT SetNow([in] REFERENCE_TIME now); + HRESULT SetStatus([in] DWORD flags); + HRESULT GetStatus([out] DWORD *flags); +} + +enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS +{ + DMO_VOSF_NEEDS_PREVIOUS_SAMPLE = 0x00000001, +}; + +[ + object, + uuid(be8f4f4e-5b16-4d29-b350-7f6b5d9298ac), + local +] +interface IDMOVideoOutputOptimizations : IUnknown +{ + HRESULT QueryOperationModePreferences(ULONG index, DWORD *flags); + HRESULT SetOperationMode(ULONG index, DWORD flags); + HRESULT GetCurrentOperationMode(ULONG index, DWORD *flags); + HRESULT GetCurrentSampleRequirements(ULONG index, DWORD *flags); +}

1 0

Zebediah Figura : qasf: Add a stub DMO wrapper filter.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: dbb53beb86a544f755178bb9b883695894141638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbb53beb86a544f755178bb9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:57 2020 -0600 qasf: Add a stub DMO wrapper filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 + configure.ac | 2 + dlls/qasf/Makefile.in | 11 +++ dlls/qasf/dmowrapper.c | 68 ++++++++++++++++ dlls/qasf/qasf.spec | 4 + dlls/qasf/qasf_classes.idl | 27 +++++++ dlls/qasf/qasf_main.c | 137 ++++++++++++++++++++++++++++++++ dlls/qasf/qasf_private.h | 34 ++++++++ dlls/qasf/tests/Makefile.in | 5 ++ dlls/qasf/tests/dmowrapper.c | 182 +++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 473 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbb53beb86a544f75517…

1 0

Zebediah Figura : qasf/dmowrapper: Add a stub IDMOWrapperFilter interface.
by Alexandre Julliard 18 Feb '20

18 Feb '20

Module: wine Branch: master Commit: 90af4d2863ef89c5fce61ddd9d1fe08997e6fa37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90af4d2863ef89c5fce61ddd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 17 17:30:58 2020 -0600 qasf/dmowrapper: Add a stub IDMOWrapperFilter interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34622 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/dmowrapper.c | 56 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qasf/tests/dmowrapper.c | 2 +- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index c7c5d3df9e..d4547d4ba3 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(qasf); struct dmo_wrapper { struct strmbase_filter filter; + IDMOWrapperFilter IDMOWrapperFilter_iface; }; static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -32,6 +33,44 @@ static inline struct dmo_wrapper *impl_from_strmbase_filter(struct strmbase_filt return CONTAINING_RECORD(iface, struct dmo_wrapper, filter); } +static inline struct dmo_wrapper *impl_from_IDMOWrapperFilter(IDMOWrapperFilter *iface) +{ + return CONTAINING_RECORD(iface, struct dmo_wrapper, IDMOWrapperFilter_iface); +} + +static HRESULT WINAPI dmo_wrapper_filter_QueryInterface(IDMOWrapperFilter *iface, REFIID iid, void **out) +{ + struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + return IUnknown_QueryInterface(filter->filter.outer_unk, iid, out); +} + +static ULONG WINAPI dmo_wrapper_filter_AddRef(IDMOWrapperFilter *iface) +{ + struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + return IUnknown_AddRef(filter->filter.outer_unk); +} + +static ULONG WINAPI dmo_wrapper_filter_Release(IDMOWrapperFilter *iface) +{ + struct dmo_wrapper *filter = impl_from_IDMOWrapperFilter(iface); + return IUnknown_Release(filter->filter.outer_unk); +} + +static HRESULT WINAPI dmo_wrapper_filter_Init(IDMOWrapperFilter *iface, REFCLSID clsid, REFCLSID category) +{ + FIXME("iface %p, clsid %s, category %s, stub!\n", + iface, wine_dbgstr_guid(clsid), wine_dbgstr_guid(category)); + return E_NOTIMPL; +} + +static const IDMOWrapperFilterVtbl dmo_wrapper_filter_vtbl = +{ + dmo_wrapper_filter_QueryInterface, + dmo_wrapper_filter_AddRef, + dmo_wrapper_filter_Release, + dmo_wrapper_filter_Init, +}; + static struct strmbase_pin *dmo_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) { return NULL; @@ -45,10 +84,25 @@ static void dmo_wrapper_destroy(struct strmbase_filter *iface) free(filter); } +static HRESULT dmo_wrapper_query_interface(struct strmbase_filter *iface, REFIID iid, void **out) +{ + struct dmo_wrapper *filter = impl_from_strmbase_filter(iface); + + if (IsEqualGUID(iid, &IID_IDMOWrapperFilter)) + { + *out = &filter->IDMOWrapperFilter_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static struct strmbase_filter_ops filter_ops = { .filter_get_pin = dmo_wrapper_get_pin, .filter_destroy = dmo_wrapper_destroy, + .filter_query_interface = dmo_wrapper_query_interface, }; HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out) @@ -61,6 +115,8 @@ HRESULT dmo_wrapper_create(IUnknown *outer, IUnknown **out) /* Always pass NULL as the outer object; see test_aggregation(). */ strmbase_filter_init(&object->filter, NULL, &CLSID_DMOWrapperFilter, &filter_ops); + object->IDMOWrapperFilter_iface.lpVtbl = &dmo_wrapper_filter_vtbl; + TRACE("Created DMO wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 397980b376..e061ca2417 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -62,7 +62,7 @@ static void test_interfaces(void) IBaseFilter *filter = create_dmo_wrapper(); check_interface(filter, &IID_IBaseFilter, TRUE); - todo_wine check_interface(filter, &IID_IDMOWrapperFilter, TRUE); + check_interface(filter, &IID_IDMOWrapperFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); todo_wine check_interface(filter, &IID_IPersistStream, TRUE);

1 0